merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Thu, 14 Dec 2006 15:57:36 +0000 (08:57 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Thu, 14 Dec 2006 15:57:36 +0000 (08:57 -0700)

Trivial merge